merge trunk
authorKenichi Handa <handa@m17n.org>
Thu, 26 Aug 2010 03:42:08 +0000 (12:42 +0900)
committerKenichi Handa <handa@m17n.org>
Thu, 26 Aug 2010 03:42:08 +0000 (12:42 +0900)

Trivial merge